bitkeeper revision 1.1285 (4256c682Sr8bRI4v12eRFHHns2y2Jw)

x86_64 fixes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
index 826b93041f691bc284d10c6d3973d79cd5b2d1e9..e490bbb629b94436d8cfb0e728c1ad7ec3b1def8 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
@@ -86,7 +86,11 @@ struct timespec __xtime __section_xtime;
 struct timezone __sys_tz __section_sys_tz;
 #endif
 
+#if defined(__x86_64__)
+unsigned int cpu_khz;  /* Detected as we calibrate the TSC */
+#else
 unsigned long cpu_khz; /* Detected as we calibrate the TSC */
+#endif
 
 extern unsigned long wall_jiffies;
 

diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile
index 7759a1432c57d403bbb4e4f3d0df9a4e5d5088c3..7f5df30bc1574b7e224fc9b988a2f25884856110 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile
@@ -14,7 +14,7 @@ obj-y := process.o signal.o entry.o traps.o  \
 c-obj-y        := semaphore.o i387.o sys_x86_64.o \
                ptrace.o quirks.o syscall.o
 
-obj-y                          += ../../i386/time.o
+i386-obj-y                     := time.o
 obj-y                          += ../../i386/kernel/timers/
 
 s-obj-y        :=
@@ -57,7 +57,10 @@ s-link       := vsyscall.o
 $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
        ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@
 
-obj-y  += $(c-obj-y) $(s-obj-y)
+$(patsubst %.o,$(obj)/%.c,$(i386-obj-y)):
+       ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@
 
-clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
+obj-y  += $(c-obj-y) $(s-obj-y) $(i386-obj-y)
+
+clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link) $(i386-obj-y))
 clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link))